Skip to content
This repository has been archived by the owner on Nov 1, 2024. It is now read-only.

Upstream 230424 #52

Merged
merged 1,139 commits into from
Apr 23, 2024
Merged

Upstream 230424 #52

merged 1,139 commits into from
Apr 23, 2024

Conversation

Vonsant
Copy link
Collaborator

@Vonsant Vonsant commented Apr 23, 2024

About the PR

Why / Balance

How to test

Media

  • I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase

Breaking changes

Changelog

deltanedas and others added 30 commits April 10, 2024 14:06
* dirty after calling SetAccesses

* fix door access

* D

* pro ops

* nukeop

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
* Update ashtray to allow all cigarettes / cigars

This also includes joints (as they are technically cigarettes)

* ?
* allow usage of network configurator for door electronics

* add checks for "allowed" items
It's possible to trigger this by stacking it weirdly with the spawn panel. Just make it bail instead.
* Fixed mixed deconstruction times for tiles and lattice

* Lattice and power cables can be deconstructed instantly
* make cryo remove crewmember's station record when going to cryo

* Revert "make cryo remove crewmember's station record when going to cryo"

This reverts commit 9ac9707289b5e553e3015c8c3ef88a78439977c6.

* make cryo remove crewmember from station records when the mind is removed from the body

* add stationwide announcement for people cryoing (remember to change pr title and desc)

* minor changes

* announcement actually shows job now

* requested changes

* get outta here derivative
Fixed potted plant hide popup/sfx spam.
Allow advertisement timers to prewarm.
* Change basefoodshaker to parent from basefoodcondiment instead

* Make them still refillable
Update editorconfig to Code Style

End of line is: CRLF (suggestion)
Namespace declarations are: file scoped (suggestion). Instead of block scoped
Grammar

Co-authored-by: metalgearsloth <[email protected]>
* NoticeBoard is craftable now

* Fix notice board to proper name capitalization

* Fix notice board proper name in description

* Update Resources/Prototypes/Recipes/Construction/furniture.yml

---------

Co-authored-by: metalgearsloth <[email protected]>
* uplink and store freshening

* more

* im gonna POOOOOOGGGGGGG

* we love it
* sterile swab dispenser

* trust

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
* Done

* Adds new

* empty

* attributions

* empty

* strobe admin deleted
@Vonsant Vonsant merged commit 3da0ebb into master Apr 23, 2024
13 of 14 checks passed
@Vonsant Vonsant deleted the Upstream-230424 branch May 4, 2024 03:38
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.